more clean-up
Nixing old code