More cleanup of cleanup, removed all use of cleanup-proc