Change cleanup methods to private
Partial progress on state