removed unncessary funcs