clean up unused functions in core