Cleanup

in creator