Remove MockData and doc edits