some cleanups and ipdb removal.
Merge branch 'hotfix/cleanups' into develop