Made some clean up before integration