Remove some commented out code that has been improved