take out superfluous functions