Removed any leftover chained code