removal of various defunct functions, refactoring of weeks view and controller