ticket:65 Another clean up