clean-up

more changes