removing scaler related entries
Merge branch 'master' into fix-reqs