Some final cleanup stuff