removed 40 deprecation warnings
Merge pull request #599 from bmaddy/deprecations

removed 40 deprecation warnings