Got rid of uneeded id