Remove patch usage, leave patch-code intact for re-use