Removed (commented out) unused method and corresponding tests