Removed commented-out unnecessary include files