Moved: Construction cleanup