Remove unused imports. A few more fixme comments.