Remove backwards compatible

Removes backwards compatible code
make tests pass