ticket:00 clean up