Update names, remove unused content