removed some uneccesary code