Some not needed stuffs remove