Cleanup cruft

Clean up a few bits left over from the rewrite but no longer used