Removed more useless lines of code