[CLEAN] Remove useless specific code