Removed unneccessary code/comments