Removed deepcopyable stuff, simplified a lot of code