Cleans up the class a bit

o removes the old setter commands as there is now
  generic ones.