Removed async tasks causing data to load and save incorrectly