Fix various redundancy issues, remove some unused maps