Remove extension code