More content cleanup