Remove  unused stuff