Clean up public controllers