Simplify buildscript