schema changes and some leftovers from previous project