Track CM torch / remove AOKP torch