Remove unused variables, change orbit pitch behavior (closes #1582).