Removed unused class members