ticket:1 clean up