minor change
Refactor build state
Lib removal
Tidy up