Simplify and reduce number of generated files
More simplification