Update for newer version of orgmode
Remove cruft