To "remove" geisha go to the building_choice.txt in your STW main directory. The 15th value for every clan is the Geisha House. Reduce it to 0. I suppose one could go all out and do the same in the unit_choice.txt but I've never found that necessary.