Some clean-up...