Perform slight clean-up