Add build config
Cleanup