Removed unwanted nodes from sample dyn file, general code cleanup