Removed some getters