Removed unnecessary parts of the code