Cleaned up import warnings. Remaining warnings are related to unused
variables, which seemed of interest.