[M] Remove the old direct instance access. Close #7.