removed stuff that doesnt work