Remove not needed includes. Remove commented out lines.