Removed commented out code.
Fix bug with clearing m2ms.
Types should not be nullable.