Removed stuff, added setter/getters