simplify build parameters
20 files changed