A few more leftovers

Controller instances misses. Extra newlines after automatic changes.