Dev => Master: Build Simplification