New version and module position cleanup.