Remove the Review MF XML tags

These were just for the review process to be covered, as is now
completed, don't need them.
Remove commented out code

Commented out code was from the Beta1 version of the interface and also
some potential compatibility stuff that really shouldn't have been
checked in