Removed some getters and setters