removing a bunch more stuff.  YAGNI