[BRK] Removed old implementation