removed stuff that doens't work