remove category mapping
many bugfixes