Removed old wrappers
Remove dependency on RTTI work in progress