Cleanup of t2listing code modifications