Remove some unwanted code