Removed stale imports, prints, commented lines