Remove map class
Remove outdated imports