more cleanups and convert to 2013