Removed merge cruft