remove all un-needed