deleted some uselss code