Removed unused functionality