annoying
fix migration
remove junk