removed stuff that either does not work is is not needed