Remove unecessary menu entries; fix paths