Remove unused use statements, fix comments