Remove not working workaround