Removed cruft.
Added support for (future) Pubs in database.