SOME MORE CLEANUP