can we remove content_id from the db (just to finish up the cleanups?)