Cleaning after vs2008 support removed

Split in multiple files are no more needed.
And removing code duplication...
Is this TODO still relevant? I know this comment isn't new, but it'd be nice to drop it if it's not correct anymore.