usability and memory cleanup