2013-03-11 Clean-up