Refactor minor changes to past-plugin after merge