Updating comments.
Removing unneccessary imports as previous code removed that used these.