Removed some unused/unneeded getters