Deleted a few superfluous lines
Fixed merge