core: remove duplicated stuff