Removed pretty much everything just to get that thing working w/o a database