ticket:56 clean up