Remove old specific code