Small cleanup. Controller is crashing; need to check comm lines.