simplify build parameters
21 files changed