Removed deprecated call
Reformatting, removed validation due sf2.2 change
Merge branch 'feature/configfix' into develop