Simplify buildfile