clean up and use concerns