Revert some merges, cleanup
more cleanup