Removed old unused code
Freshened up old code