Remove extra items
Add more debug
Add more more debug