Cleanup for 2013-10-31-cms