20141029 Delete unused code