construction cleanup

construction cleanup