got rid of functions we don't need