Debugging... remove more cruft