GTNPORTAL-2748: update portlets and clean up code