Remove preloaded crap data and finish up schema