Clean-up and convenience features