Lots of cleanup on import statements