Cleanups. Take 1.