Remove some code that used to do something but does not anymore, mainly