removed some test-code commented out