Revert Unit + remove $_file declaration +remove isSite