removed some more unnecessary stuff