clean up 20140920 - franmcob