removed unused getters
added missing class