remove un-needed functions