General cleanup, Difficulty Plugin is migrated.