Cleaned up config and build definition.