Got rid of non-kosher code