Cleaning up to prepare for a functional build