Cleaned up unused Vintage mappings