removing some code that was only for testing, we'll see if we can get rid of it all