Remove unused import
Fix "<CR>" expansion