Minimize the ace content in the project, and other small optimizations