remove unnecessay functions