[CH,PO]{other} Removed some warnings by deleting unneeded imports.
Merge branch 'master' of https://github.com/RolandDanninger/sw14_xp_04.git