Build system cleaned up.