Remove stuff and add id