[KFSPTS-3606] Removed some junk in preparation for code review.