Cleaning up construction

18 FEB 2021