removed commented old function