removed commented redundant code