Clean up some comments
Fix destroy method to use new architecture
Fix more tests