cleanup and ux