sorta complete multi/onepage cleanup