PSDEZONE-206: Fixed issue with wrong package-paths. Removed obsolete fun...

...ctions.