Added proxy class references to cleanup code