remove conflicting stuff