Removed obsolete imports & commented-out code