Declusterfuck and rebuild for dev