clean up unecesssary code