Removed unused members and methods