Clean up bad references to self