remouved unneiededde funhkshiunz and da kowments