Cleanup stuff

i am fine with remove this part of code.