Update outdated doc comments
Remove unnecessary imports