Removed unneeded lines of code