Clean up cgmath stuff