Fix typo and bad doc
Remove unneeded imports and lint supression
Start work on deleting places