Removed two NotImplementedException.