getting rid problematic code