Remove dead code

Just cleaning up some unused code