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

This reverts commit 2a6ffbc5c9666d2ebde31d4f4d1e868da4a7431f.