removed some unneccessary code