git rid of two functions