Removed all $that variables