Got rid of the rest too