Added map cleanup to Cleanup class and added usage of it to MapTests