cleanup some unneccessary code