removed metadata.json and few more fixes