code cleanup: removing duplicate BookMarkManager implementation