Update 1203.2

Some deletes to solve android problem