Consumes migration1

consumes migration for a bunch of remaining packages and code cleanup. more will come.