cleaned away some test code