Eclipse clean-up