Clean up the structure of common controller and handler instances