Getting rid of some no longer needed code