cleaned up a couple of unused imports and unused variable warnings