Removed some to-do items, because they are to-done.
Removed some unnecessary imports.