Route storage registering through core. Remove some deprecated and bugged stuff.