Remove unneed code