improve coverage, remove un-needed fns