Refactor/deprecation warnings

* Added many deprecation warnings (should be good to go here)
* Removed DBT stuff
* More refactoring
* All tests passing