12 Jun 2014 cleanup