Some clean-ups