[feature/clean-up] Remove duplicated code from portal modules

B3P-CU