Remove computed properties in favour of a single method