Remove unwanted selves