MPS-17315 - Reused existing behavior methods, removed unneeded code