More clean-up
Even more clean-up