Removed helper functions