added custom modelmetadataprovider and project cleanup