Clean up cruft, cleaner interpreter model now.