removed the extra stuff left over from the refactor.  I still haven't done anything with the ammendments stuff, fyi.