Removed some unused content from Common