rm old stuff, simplify, etc