remove eval
fix cs