Removed async stuff from new branch