cleanup and new schema