Removed utility functions