General cleanup for 2013