more build simplification