Revert "FW: Some House Keeping"

This reverts commit 21480c76e50545d91291a59d5cf147d8401cd4bd.