Remove some code that was not needed