Cleanup runtime.scm. Not sure this is all correct yet.

Change-Id: I96ed882371c45bd5b469841b9c8e3bc35c69eb06