Minor comment fixes, remove unused imports