Unused metadata data removed

more tweaks for sample app, increment db version