Removal of dead code. Tidy up.