Begin cleaning up ACE integration