moved context menu class
cleanup