removed stuff I no longer intend to do