Cleanup, format and update fix.

Removed php filter, quick format update, removed unused code, updated
some variables.