migrating changes and removing SD2 Bug code