Remove some remains