Removed unecessary lines of code