Bug 851248. Add tp5o and clean up. r=philor