More doc fixes
Cleaned unnecessary imports