Added ObjectId (forgotten in last commit), more experiments with cleanup (SQL required badly)