Cleaning up construction