cleaning up metadata dependency