Cleaned toolkit