Minor code clean up (gizmos are gone!)