Cleanup

Meta-data initialization simplification