Remove `current-time' macro (exists in Org as `time')
Fix usage of `date' macro