Remove more dead code

Created by  Eelco Dolstra  on October 3, 2013
LFZQIVPXJFWWSTTIVVSWYUTTFDDBQBEIV5657RIHMSKK634Z2WFQC
Change contents