Some clean-up..