Clean up, git rid of instance variables