Deleted unused imports.
Started implementing #12 and it's test in #13.