Issue #286: more repo cleanup
Issue #277: cleanup mistake