fixed imports and unused fields warnings