Cleanup and fix for xdebug settings