Style cleanup
Remove old options framework filters
Clean up the header cleanup stuff.