Few clean-ups