Fixed git errors introduced in previous commit. Removed unused import.