Remove some un-necassary code