Remove all dicionary usages