Remove build warning (reference to unused layout).
Update TM content to use bluebird for promises with cancellation.