ticket:57 cleanup