* Some clean-up