Ready for testing.
Tested OK. Commented out code removed.