Remove some code that is no longer needed