Removed common utility functions