Remove unused module imported
Fix 500 error on save about duplicate key error