removed some helper functions that we already have in core