Updates for initial release

Cleanup items for initial release