remove ugly sync call & cleaning