Cleanup after discussion with Russell