remove 2 functions