Removed some extraneous code/comments