Removed unnecessary booleans for getcomps and getangles