Cleanup for possible refactor.