Ship: Removed duplicate code