Feature/cfy 785 remove blueprint source