cleaned merge cruft