remove unnecessary .hx files, update menustate