Removal of un needed code.