[TASK] Remove obsolete singleton implementation