Fixed menu highlighting issue.
Dropped some obsolete sources.