Clenaup for temporary fix