Fixed a lot of warnings, removed unused content