Tidied up Code

Removed the code that was commented out during the 3.x port.