removed lots of old testing code