Removed unused members