Removed mess left after merge