cleaned out some unncecessary code