removed stuff i forgot to trash