4.0: Remove some tools
4.0: Fix variables