Made some cleanups here and removed old api usage
Merge remote-tracking branch 'origin/master'