Cleaning up the [x] in some element names