removed some unecessary lines