[Refactor Ticket] cleanup