Removed some unecessary lines