remove un-needed return statments