Fix ordering in models

it makes for better drop down lists everywhere
and remove useless field that may cause problems