Tidy unneeded material