Remove more specific code