rebase clean up
further rebase cleanup
was broke, now fixed