get rid of extra functions