Some cleanups!