Cleanup, removing now-useless code