ENH cleanup of dev controller