Cleaned up imports.
Removed unneeded scalar option.