Problem: there's a lot of code that we no longer need

Problem: there's a lot of code that we no longer need #134