Some cleanups..