Clean up controlHandler