Removed unneed code