remove metadata class, keep everything in one for now