cleanup unnecessary functions from code