Cleanup of custom extension stuff.