Fixing missing min() for linux builds and removed missing constant, remove unused function.