remove unconfirmed NL-brimstone rail
fix some edit-mode stuff