First revision of clean-up script