CALC-175 - Clean up development environment (work in progress)