removed commented part and some not used code (nw)