Removed multiple superfluous getters/setters