Cleanup

Some more cleaning up that the next features of Borel requires, see borel