Remove unnecessary attributes from Voyage
Merge branch 'ChapterTwo-8' into development