deleted problematic code