clean project + fix issue due to async call