Fixed depth issue and some model changes and cleaned up some trivial deprecations