removed a load of commented out code