Clean up abbrevs