1.8.1 - final cleanup