got rid of problematic code