Removed unused references. Updated namespaces.