remove unnecessary bundle imports
fix foreign key naming error