ticket:00 Another clean up