Some code cleanup done. Mainly POIModel, poimanager, etc.