remove id
cleanup