Remove a bunch of unnecessary computed properties