(PUP-490) Remove partial support for import (the sequel)

This also removes the parts that were first marked as deprecated
as they are actually unused.