Some clean-up done