Makes sure I remove the right thing.. But, the idea is to figure out why this is happening and fix the root cause :P