Cleanup debug messages, removed some test code