O'Rourke disco: resolve (update or delete) "forthcoming" entries
delete trailing whitespace