testing, and removing some unecessary code