Added metadata model to file
removed unused exports