Fix shadow (hopefully) for the last time

Delete shadow dev, merge that into shadow. Standalone shadow put on hold