code in this class seems to be organized with all the set methods followed by all the remove methods.
should move to maintain consistency