Another final cleanup :)