removed unnecessary import
removed some unnecessary imports, fixed code generation issues with
associative tables