De-clutter complete

De-clutter complete

De-clutter complete