holiday: some inital cleanup