clean up construction and config