clean up code [#ff5bd69634fde961b3e181ee4962379c52d3d981]
clean up code [fa00cd0d098b3b1acc2fb3a8078a38eaf9cfd376]
check against is role technical [08e5684c15c282f357c44ab5eb74aaf2b5d967c7]