Removing unrequired templates
Renamed task tab -> map