MNT: Removed problematic code