Cleanup some getters