Cleaning up before moving on to new features