unnecessary value definitions removed