Help keep Salon independent

Topic: clean-up