Revert "Refactor endFstAssessment method"

This reverts commit 17bf69f565ea9224b29dde95b4f86f4853ec9eda.