Remove some unnecessary code

Haven't been used for quite some time, time to let go.