Remove specific code, there was not generic code