Deleted map class and did some fixes