remove a couple devel::declare hacks