Removed commented testing code