Cleanup + remove 2013-error