Removed all remaining traces of bad things