Hopefully last bit of clean-up