cleaning up old code, new db file for fall 2014