Remove more unused math