remove un-needed extra lines of code