UI-708: Refactoring and cleaning code
UI-708: Simplify port request deletion
Merge branch 'UI-708'