fixing time display
removing duplicated heartbeat service implementation