More XIB Cleanup