strip stuff
simplify some more