Remove trig stuff from this branch (whoops)