more extensive cleanup
cleanup mark 2