Remove obsolete comments
Remove unnecessary import