Remove unused method
Fix remaining quality failures