Remove unused primitive dependency
Add debug flag