killing off the raw queries in favor of the object's proper load functions
removing the now-irrelevant notes