Removed some unneeded variables adn their getters/setters