Updated configuration
Removed .cppuseful recursion