cleaning Navigator and Index classes