Remove deep watch b/c we are no longer tracking real-time changes of the config/default value
Add missing closing tokens
Remove function no longer used
Update comments