Cleanups

Some cleanups