Removed #if since they don't work in library