v2.9.3 - Moar clean

More cleaning.