removed unneed code