retrofit core cleanup and migraton fixes from 2.6