Removed some uneccesary code