ticket:13 cleanup