Remove session (use menu objects to store the things)
Some stability improvements