Rewriting based on ACE3
More cleanup of old code
Some more cleanup
Make sure old code is not run...