Unfinished cleanup
Checking content of segment