Removed redundant code/comments