removed stuff I no longer use