Cleanups, more mutations