Some clean-up