Removed old crap code