removed junk that slows down tests