Revert "Possibly added Metadata support"

This reverts commit 065da9ae3138ae720a97527e7f3a94e28059eef4.