* Removed proxy references