Last touches and house cleaning