simplify build parameters
5 files changed