Simplify statement
Remove commented code/var_dumps in core/
Remove commented debug code/var_dumps in plugins/