LIVEOAK-627: Clean up commented out code which should not have been committed