Modified the SQL script and the model to match them and to remove useless things.
removed temporary files who shouldn't have been there