Removed unnecessary pieces of code.