Added DelData, GetData and MakeData to make the project cleaner. Also removed some uneeded code