ticket:14 clean up