Construction Clean-up

Clovis