Cleaning up runtime to make it more generally usable