Removed imports & warnings