Deleted redundant code and comments