Cleanup

more ticket object integration