backed out cleanup routine as it should be done where I had it
pretty much ready to for RM support