2014-06-15 updates and cleanup