Removed unused import and variable