Drop dependency on 'singletons' library