removed stuff no longer needed