Remove unused header
Replace infinite bounds with min or max doulbe values