CON-999: Remove set and get methods