Remove possibly problematic code