Removed Unused Classes
Changed Cup Portlet
Small change for weekID