Removed unused that