remove extra logging and use a goroutine where needed