Work in progress - runtime clean-up.