ticket:1 cleanups