removed functions that aren't needed