DIYMenu cleanup
DIYMenu cleanup p. 2