Cleanup in 2014-10-05