Cleanup for re-code