Get rid of more functions