get rid of unnecessary functions