major cleanup of sessions 1,2-3