remove function fixed