Removed unused getters and setters