replace tabular by easyalign
improvemnts in maps for indent file
remove old stuff