Construction cleanup by Don Aslett