cleanup
fix git snafus