removed problematic code