Hopefully last clean-up