code cleanup #1

#1 

minor changes; remove dpm, menu item update