Tidy: change logging to PROGRAM
Tidy: change logger.error to log
Fix: remove from running items when service yields None.