Remove broken functions