TIMOB-10422 Cleanup, getting ready to be presentable.