- [IMPROVED] improved cleanup script (pre-configuration)