Cleaned up bad imports. Fixes #544