Reintroduce previous paste cleanups to new logic