remove the functions now