Remove generics from Math functions