simplify build parameters
6 files changed