[ticket/416] Remove unused code

B3P-416