GTNPORTAL-2990: Cleaning Beans and adding headers.