Cleanup + Notary Warning