removed unused values and some minor updates