Cleanup from Bagit Library v0.2 refactor