Standardizing FS removal

Motivated by an issue with failing Egyptian revivalism found in #364 (closed). Turns out it was not the only future society with some issues if it got dropped. Should be pretty much standardized and working properly across the board now.