Removed code added back in merge conflict resolution
Added meta programming sample