Remove problematic files first...