Move more stuff to delivery plugin