Handles cases where NOT configured for cleanup, but we still remove the preserve-- prefix. Also prunes trailing spaces