Add some more debug logic
Remove constants