ref #8321 cleaning up cotroller code