Some cleanups
Test commit