20131105 - clean up useless code and files