remove unneed code
update seperate file
bug fixed on android