Move secret to databag, clean up