cleanup

more cleaning