deleted some more unnecessary code