more removing of SourceID from classes