Removing runtime cruft