Remove: un-necassary code