Removed unnecessary parts of code