Build simplifications

Please review and accept.