Taking out buggy stuff