Added cleanup on a 1 hour timer