remove unused reference
raise instead of returning None
remove unused import