remove package rename artifacts (unnecessary imports, long lines etc.)
64 files changed