#121 Remove extra import (oops); rebase this commit into the last one before merge