Cleaned some unnecessary parts of the code.