fix order for cobbler, clean up some old code