Cleaning up

more cleaning up.