added clean up on quit