Working through checker and scm calls APPENG-3220
remove mess