remove intrusive STAGING_DIR references in the patches, cleanup