Cleanup up, removed unused import