removing unnecessary constants
removing unnecessary old comment
fixed the issue where having calendar set as the default would go to welcome instead

resolves http://bugs.web2project.net/view.php?id=1524