Refacotring codes: remove topic key prefix