removed commented old code