Removed all non-player stuff in Measure for awhile

After bug fix will restore.