Cleanup of -t