Removed unsued references
Lots of reference updates
Updated binding conventions