removed duplicate code sections.