Simpifications
Build cleanup
cleanup