Cleanup stuff so Luiz is happy