Removed the unused proxy classes