Cleaning up import warnings and unused field/method