remove the commented out code and re-order the items to match the ui

The order doesn't matter here as it is not used to order the items in the UI. I've done it in case we do use it somewhere.
add a note for future editors