unfinished merge cruft removed