Initial work on metadata
Implement removing metadata