Construction Final clean-up