deleted some more codes