Remove unused function stubs
implement better mappings with 'count' argument