Removed some default lines of code that was not needed