Remove type check in one case, add comments in another case
cleanup imports