Removed some cruft. Still very dissatissified with how I'm handling ObjectWrapper and it's derived types