Random import cleanups, etc